From 3526ae12fffdb116ca5aa2955c7105911b9181d2 Mon Sep 17 00:00:00 2001 From: Ralf Treinen Date: Wed, 18 Jul 2007 16:37:08 +0000 Subject: [PATCH] ocaml-mode: do not hardcode emacs flavours --- debian/changelog | 9 ++++++--- debian/ocaml-mode.emacsen-install | 18 +++++------------- debian/ocaml-mode.emacsen-remove | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7dcb62e1..fef40100 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -ocaml (3.10.0-5) UNRELEASED; urgency=low +ocaml (3.10.0-5) experimental; urgency=low + + [ Ralf Treinen ] - * NOT RELEASED YET + * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which + to compile ocaml-mode (closes: Bug#433082) - -- Stefano Zacchiroli Wed, 04 Jul 2007 11:28:02 +0000 + -- Ralf Treinen Wed, 18 Jul 2007 18:31:31 +0200 ocaml (3.10.0-4) experimental; urgency=low diff --git a/debian/ocaml-mode.emacsen-install b/debian/ocaml-mode.emacsen-install index bdd3f1bc..25122966 100644 --- a/debian/ocaml-mode.emacsen-install +++ b/debian/ocaml-mode.emacsen-install @@ -8,14 +8,7 @@ FLAVOR=$1 PACKAGE=ocaml-mode -case ${FLAVOR} in - emacs20|emacs21|xemacs21|emacs-snapshot) - ;; - *) - echo install/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR} - exit 0 - ;; -esac +if [ ${FLAVOR} = emacs ]; then exit 0; fi echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} @@ -41,15 +34,14 @@ install -m 755 -d ${ELCDIR} cd ${ELDIR} case "${FLAVOR}" in - emacs20 | emacs21 | emacs-snapshot) - FILES=`ls *.el | grep -v caml-xemacs` - ;; - xemacs21) FILES=`ls *.el | grep -v caml-emacs` ;; + *) - ;; + FILES=`ls *.el | grep -v caml-xemacs` + ;; + esac cp ${FILES} ${ELCDIR} cd ${ELCDIR} diff --git a/debian/ocaml-mode.emacsen-remove b/debian/ocaml-mode.emacsen-remove index abc5bd3f..1f168b36 100644 --- a/debian/ocaml-mode.emacsen-remove +++ b/debian/ocaml-mode.emacsen-remove @@ -1,4 +1,4 @@ -#!/bin/sh -e + #!/bin/sh -e # /usr/lib/emacsen-common/packages/remove/ocaml-mode FLAVOR=$1 -- 2.30.2